Merge from emacs-24; up to r111266
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 15 Feb 2013 06:35:54 +0000 (22:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 15 Feb 2013 06:35:54 +0000 (22:35 -0800)
commit8b13e587b6d374f19575702b10be931c76746156
treefb780af9c45f4a213daf55a4c82072274fdd1ddc
parent26f16bcee545e75bb9623f4dc7f6141ccf2306e5
parentee514cc204aa93206327fca6f795e447501b94e4
Merge from emacs-24; up to r111266
ChangeLog
configure.ac
doc/lispref/ChangeLog
doc/lispref/modes.texi
lisp/ChangeLog
lisp/progmodes/python.el
src/ChangeLog
src/lisp.h
src/w32.c
src/w32proc.c